From f656d38e598e1ab23a2295a2dc090b926e6a5bc6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 19 May 2019 13:29:37 -0400 Subject: [PATCH] password entry: Make not subclassable Part of being more explicit about what we allow to be subclassed and what not. --- gtk/gtkpasswordentry.c | 5 +++++ gtk/gtkpasswordentry.h | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c index 4d7edba2e8..0bcda0aaec 100644 --- a/gtk/gtkpasswordentry.c +++ b/gtk/gtkpasswordentry.c @@ -60,6 +60,11 @@ typedef struct { GdkKeymap *keymap; } GtkPasswordEntryPrivate; +struct _GtkPasswordEntryClass +{ + GtkWidgetClass parent_class; +}; + enum { PROP_PLACEHOLDER_TEXT = 1, PROP_ACTIVATES_DEFAULT, diff --git a/gtk/gtkpasswordentry.h b/gtk/gtkpasswordentry.h index 2527c58ca2..3e1bc82099 100644 --- a/gtk/gtkpasswordentry.h +++ b/gtk/gtkpasswordentry.h @@ -31,10 +31,7 @@ G_BEGIN_DECLS #define GTK_TYPE_PASSWORD_ENTRY (gtk_password_entry_get_type ()) #define GTK_PASSWORD_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PASSWORD_ENTRY, GtkPasswordEntry)) -#define GTK_PASSWORD_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PASSWORD_ENTRY, GtkPasswordEntryClass)) #define GTK_IS_PASSWORD_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PASSWORD_ENTRY)) -#define GTK_IS_PASSWORD_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PASSWORD_ENTRY)) -#define GTK_PASSWORD_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PASSWORD_ENTRY, GtkPasswordEntryClass)) typedef struct _GtkPasswordEntry GtkPasswordEntry; typedef struct _GtkPasswordEntryClass GtkPasswordEntryClass; @@ -44,11 +41,6 @@ struct _GtkPasswordEntry GtkWidget parent; }; -struct _GtkPasswordEntryClass -{ - GtkWidgetClass parent_class; -}; - GDK_AVAILABLE_IN_ALL GType gtk_password_entry_get_type (void) G_GNUC_CONST; -- 2.30.2